* vc/vc.el (vc-merge): Fix a prompt.
authorSimon Leinen <simon.leinen@gmail.com>
Sat, 24 Mar 2012 13:23:23 +0000 (21:23 +0800)
committerChong Yidong <cyd@gnu.org>
Sat, 24 Mar 2012 13:23:23 +0000 (21:23 +0800)
commit2659445b47320f30a6fce35c5a9cb41c8e7d8041
treee6da029610977022df92eadd9d753411cebdbc0d
parent9538ea6e1db78c0c3de745e506fe9a292b4e0b27
* vc/vc.el (vc-merge): Fix a prompt.
lisp/ChangeLog
lisp/vc/vc.el